From c0eab55ed74f6ea02edd7939731600653de18864 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 29 May 2012 16:36:52 +0100 Subject: [PATCH] libxl: wait for state "connected" in libxl__device_disk_local_attach In order to make sure that the block device is available and ready to be used, wait for state "connected" in the backend before returning. Signed-off-by: Stefano Stabellini Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson [ ijc -- resolved simple conflict in libxl__device_disk_local_detach ] Committed-by: Ian Campbell --- tools/libxl/libxl.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 44e6dece72..8a18fdf662 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1781,9 +1781,10 @@ char * libxl__device_disk_local_attach(libxl__gc *gc, const char *blkdev_start) { libxl_ctx *ctx = gc->owner; - char *dev = NULL; + char *dev = NULL, *be_path = NULL; char *ret = NULL; int rc, xs_ret; + libxl__device device; xs_transaction_t t = XBT_NULL; if (in_disk->pdev_path == NULL) @@ -1863,12 +1864,25 @@ char * libxl__device_disk_local_attach(libxl__gc *gc, break; } - out: - if (t != XBT_NULL) - xs_transaction_end(ctx->xsh, t, 1); + if (disk->vdev != NULL) { + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); + if (rc < 0) + goto out; + be_path = libxl__device_backend_path(gc, &device); + rc = libxl__wait_for_backend(gc, be_path, "4"); + if (rc < 0) + goto out; + } if (dev != NULL) ret = strdup(dev); return ret; + + out: + if (t != XBT_NULL) + xs_transaction_end(ctx->xsh, t, 1); + else + libxl__device_disk_local_detach(gc, disk); + return NULL; } int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk) -- 2.30.2